merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 4 Nov 2011 05:56:41 +0000 (14:56 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 4 Nov 2011 05:56:41 +0000 (14:56 +0900)

Trivial merge